Allow user to skip pixelcal after pixelcal #517
Merged
+35
−9
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of work
If the user performs pixel calibration, but sees that it did not do anything positive, allow the user from the tweak peak stage to elect to skip pixel calibration and recalculate.
Explanation of work
After all the other changes, this was very trivial.
Add a new button to tweak peak view for skipping pixel calibration, and add a check if the user changes their initial selection.
If the initial selection changes, recalculate with/without pixel calibration.
To test
Dev testing
Run diffraction with 46680, skip pixel toggle set to False.
It should fail. In the workspace list, open the two table workspaces,
diffract_consts_default_v0
anddiffract_const_046680
. Compare, and ensure these are not equal workspaces.Right-click on
diffract_const_046680
and rename it to something obvious so that it is not overwritten.Set Skip Pixel Cal toggle to True and continue. There may be a warning about a workspace already loaded.
Set Skip Pixel Cal toggle to False and press Recalculate. The same warning will come up. Close it.
Compare the new
diffract_const_046680
to the original. They should be identical. This proves the workflow is being re-run without skipping pixel calibration.Change the grouping and recalculate. Make sure it works.
Change the grouping and a dMin and recalculate. Make sure it works.
Change only a dMin and recalculate. Make sure it works.
Continue to save. You'll have to set Skip Pixel Cal to True and change the FWHM to 4 and Recalculate to continue.
CIS testing
As above, but I suggest 58882. Make sure to inspect the before/after files in slice viewer. Make sure you can find them and they make sense.
Link to EWM item
EWM#7712
Verification
Acceptance Criteria
This list is for ease of reference, and does not replace reading the EWM story as part of the review. Verify this list matches the EWM story before reviewing.
NOTE Following conversation with Malcolm, the behavior of iterating pixelcal is not necessary as there are no parameters to adjust.
after pixel calibration, user has available two d-spacing unfocussed workspaces reflecting separately the input calibration and the output calibration (i.e. application of the pixel-calibration-generated DIFC values).already met in PR After completion of pixel calibration, show unfocused before and after #511The user can continue to next stage of workflow if desiredalready met